Creating nickanme method to isolate logic at model level
Fixing code errors after review