cleanup
Fixed body function