Re-indented

Also, switched to declaring arrays with []