Refactoring

Cleanup 3