Removed unneeded code, and improved readability. Set TODO's 
to clarify the next steps.
Merge pull request #2 from zypher452/cswipe

Removed unneeded code, and improved readability.