Change name Node or Body to BodyNode (and fix code style)