hm: style cleanup