minor code review before 0.9.4.2