Moved parse_file, PEP8 cleanup