small changes at model attributes, removed unused imports, added some
comments