Beginning to implement coding convention update to match Pep7.