Return type fix
Simplify body types