Beautified some code