Further readability cleanup