Some minor fixes regarding keyword formatting