Changed names and comments to be more accurate.

Removed search- or exercise-related parts.