fixup, refactor and stuff