Remove class variables

The class variables are not needed because we are using instance
variables. Also remove the underscore prefixes to improve readability.