model and template changes
cleaned up on method calls