Refactor tower
Refactor tower