Review/cleanup

misc cleanup performed while working on mi_derived branch (#232)