Some code style refinements