cleaning up data
fixed conflicts w/ header