[axof: 162] cleaning up some design