PEP8 and added a TODO