cleanup shitty code