Some language and code updates

* Refreshed the code to a new style (more wordy)
* Refactored code a little bit