Very small changes
Additional commenting, much more efficent and streamlined.

There shouldn't be too many more modifications that need to be made to
this code.