Cleaned templates and changed model