Minor clean up, make file and body handling symmetric