Cleaning Up

Deleted a lot of commented sections that we didn’t need anymore, so our
code is a little more pretty and understandable.