Minor refactoring
Merge branch 'abstractj-AEROGEAR-934'