Cleanup unused files
Cleanup indentation