Post refactoring and clean up