Refactoring

Cleanup 2