Updates to enhance readability