Rewrote some methods, renamed others, removed others

* Rewrote a few methods without changing what they do
* Renamed a few to more explicit names
* Removed methods that were called only once or could otherwise be disposed of