removed id from models, and added str representation