minor code cleanups
moving away from dependency on bozorth because ARGH NAME MANGLING
initial commit