Refactor validation builder

some decluttering