removed spaces and re-indented