Style cleanup - adding more sensible indentation