Clean and rename simplefileparser