Several Code Changes

Changes to comments and some code structure, as well as adding
performance testing