clean code and update grammar