Refactored all models. Doing stricter checks and data cleanup before storing to database