Slight changes to prevent file clutter