remove code better design, modify function name.