Beautification
Some work so far..