please cleanup code before push to github