Clecn up of methods