Added make_func_bodies and make_main_function