Refactor. Improve class names.