Refactor code for 1.0 release

As no issues have been discovered so far, I'm getting ready to refactor and clean up some of the code in preparation for a 1.0 release of the module.