mass formatting overhaul to more closely comply with pylint