Cleanup and a small refactoring