refactor some shitty code