[#1451] pep8 and a few things to make things a look nicer