Update grammar, styling