issue46, some further style improvement