Code review

Hope it compiles; see previous commit(s)