Deleted commented out code and did some minor code reformatting.
Merge pull request #69 from nwinklareth/master

Deleted commented out code and did some minor code reformatting.