COFFEE: change some variable names and comments