Add more debugging messages to make it clearer what body type is used
Formatting