Working on loading files faster + Clean up