Implements review comments from Massimo, minor indentation fixes
Implements review comments from Massimo, minor indentation fixes

aerogear/aerogear-unifiedpush-server,secondsun/aerogear-unifiedpush-server,secondsun/aerogear-unifiedpush-server,aerogear/aerogear-unifiedpush-server,secondsun/aerogear-unifiedpush-server,aerogear/aerogear-unifiedpush-server