fix merge derp and do a little cleanup