whitespace; variables; best practice reorg