clean some code #109