Refactored a bit more according to code review.
Refactored a bit more according to code review.

Thanks @markijbema

Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core