Clean up whitespace and add a new variable