Little modification on code style