Refactoring

Cleanup 1