Fix some formating & rm obsolete comment.