Comments, reorganizing code