(refactor) Clean up variables