PEP-8 Some variable names
Small name cleanups
Add todo list