clean code, and code style change