Clean code
Merge branch 'JFG-423' of https://github.com/kgribov/jagger into JFG-423