APS & JTR: snippets refactoring complete