Beautified and fixed