Cleanup. Changed from tabs to spaces