global level refactoring and clean up