Comments adapted
format rules applied
spelling found