cleanup code

Please use the command field in github to comment a code line.
It's easier to handle the code.