clean up body searching
fix spacing