Indented and cleaned up a bit