Idiomacy pass

@andymoe - continued clean up as discussed