cleaning up set method on basemodel