Refresh refactoring
housecleaning