added TODO, and refactored to accommodate over-sensitive PEP-8