MICASERVER-53 - code review corrections