Beautification and some grunt