Code cleanup in prep for pykegg effort