fix copy paste derp and clean up