Corrected indentation
A few cleanups