cleaning up data... really need to refactor to templates... next go around