Removed unneeded code, and improved readability. Set TODO's 
to clarify the next steps.