Refactoring
Some renaming and verbiage changes
Cleanup and results from writing a post