Move status checks to maps
Refactor validator into own class