Beautified the code