Comments + renaming of few methods