customizable defaults
Renaming of internal functions to symbolize them as internal
Re-extracting methods as preparation for class extraction