Refactoring/clean up