@jtlan's style suggestions