MICASERVER-127 Various style fixes