Refactor class variables.
Update tests.