Consistency tweaks; indentation 2 spaces