Fixed the first batch of pull request comments, proper naming, white spaces