Apply style issues reported by review