AEROGEAR-1014 "Minor code clean up"