Cleaned up messy file handling