number names optimisation PEP-8 and 2.7 fixes