cleaning up some shitty coding