tweaks: improve some indentation and reshuffle a few lines
4 files changed