Make indentation consistent throughout