Cleaned up file load system