Beautification and clean up