Quick refactoring and cleanup