style fixes for issues reported by client