Sanitize node 555

Modifications after Seann's code review.