Code refinements for better readability