Refactoring Tower

Refactoring Tower