Beautified somewhat