Cleanup: indentation fixes
Cleanup: removed dead code