Beautified the code from yesterday.