correct comments; fix format