minor reorganization and styling tweaks