Changes for PEP-8 #3