Refact validators