APS & JTR: Snippets/refactor

![impressed](https://f.cloud.github.com/assets/5043885/1538333/ec9acfe0-4ce1-11e3-892f-ddf19dd9efaf.gif)