Added TODO item
Make module names pep8 compliant