Cleaning Up and minor fixes

This version makes the code a bit more organized. Adds more comments, makes part of the code more readable, removes unnecessary code and there is also a minor fix with a variable typo.