added normalize methods to models and proper calls