Trivial cleanups: rename class, remove unused code,
rename some variables and methods.