Some more levels
Cleanup: removed unused method
Cleanup: Nesting functions