refactoring
Cleanup, etc