reorganization and formatting/cleaning