Refactoring and other cleanup