Beautify assignment 3