APS & JTR: Snippets/refactor

![slam_dunk](https://f.cloud.github.com/assets/5043885/1538322/74c9ec4e-4ce1-11e3-90ae-7a455a431b38.gif)