Code style refinements