Clean up declarations in parse_file function