Cleaned up file loader a bit