cleaned files and fix scanner