Minor cleanup & Fix Hopper Pep8