Refactored some code
Made data object immutable
Added unit tests for util classes