updated and cleaned files