MICASERVER-47 - code review corrections