Did minor refactoring to make classes as immutable as possible.