Resolve "Extract relevant code into validator classes"

Shiza Ahmadrequested to merge
45-extract-relevant-code-into-validator-classes into main

Closes #45

Merge request reports