More beautification

As indicated by the title. Make it look more consistent.