small cleanup. was going to try submodules, but they're not as nice as i thought