Beatify and comment code