Rename variables and add whitespace for clarity