Remove more unnecessary vars, methods, and include
Fix indentation