Reduce gol code further