Clean files for consistent var usage