optimize code style