cleaned up defs