Continuing to fix readability