More adjustments to make the code slightly more readable