fix length checks
don't check body, add comments
add comment, reduce whitespace