Refine code style easier to read