Beautification

a lot of it