Refactor and argument fix an reparsing of files.