Some tower refactoring