code style improved