Refactoring cleanups