PEP8, remove TODO; resolves #86