more clean up and split out mugshot