Third-Half Commit

normalize db & optimize model