Removed some unnecessary comments, added a few, reorganized methods to a more logical order, and other small things - Issue #20