Moved some things around and tabs to spaces