basic reorganization and whitespace