Tidy code and comments.