Beautify and some comments...