#147 remove useless blank lines
#147 refactor code
#148 refactor commit 969d423