Cleanup, and added  to BaseModel@validate()

Signed-off-by: Tom Green <kingofcuddles@gmail.com>