Rearranging codelines, adding comments