Removed unused check and extracted constructor for test coverage