Refactor, improve class names.