style tweaks after self code review