gol commenting and reorganizing