Refactor some shitty code :stuck_out_tongue: