- code reorganization and formating