reformat and lint and stuff