Class improvements, improve testability.