Cleaned up File::load some more