remove use of  keyword, some small changes. fix #6