Beautified the Code a little