Refactoring (Various non-end-of-the-world-this+thats)

please see commit cotes and let me know if you have questions...


![screen shot 2014-08-28 at 10 26 59 pm](https://cloud.githubusercontent.com/assets/262517/4085813/7b1172b8-2f24-11e4-86cd-b8cbfea27d65.png)
![screen shot 2014-08-28 at 10 22 38 pm](https://cloud.githubusercontent.com/assets/262517/4085812/7b0cb944-2f24-11e4-9679-c7ec31383b8e.png)