Refactoring to make class-design easier.