Merge TODO, all other pep8 conventions