Small refactor

Change-Id: Ibfbb264159b5a0c0deeba667370b9958a535be91
Merge branch 'master' of git@github.com:Netsensia/netsensia-zf2-skeleton.git
Refactoring

Change-Id: I7b292fc8fd60f904275c9cec68fd156908ce1018