Clean up vars and comments