Solving some of the cosmetic comments.