Cleanup
more refactoring