maintainance

Renamed the variable to something that makes sense and removed some
classnames.