Beautified a bit