Refactoring, clean up