bug fixed && style adjust