Minor code clean up.
Merge branch 'danbev-AEROGEAR-1014-code-cleanup'