Changed from tabs to spaces, pep8