Bug fixes and TTD tidy up.

TTD Tidy up:
![lp-ttd-tidy-up](https://cloud.githubusercontent.com/assets/708296/4118637/904a4d1c-32a3-11e4-8209-5875a73a1200.gif)
Can this use one of the utility classs?