cleanup
More refactoring