Refactor to Parametize and Relatable