Beautified and other stuff :)