refined code style