added commenter and simple formatter