Changed project_id to project and addressed comments.