APS & JTR: snippets refactoring complete

![way_too_happy](https://f.cloud.github.com/assets/5043885/1538573/8c85c9dc-4ced-11e3-9b45-76ea3ee0b64c.gif)