Beautifying a bit more