Code Clean up: variables