Refactored and removed code
Fixed mismatch in hamcrest version