pep8+refactor+fixing double space minor issue