Improve comment lines
Indent
Remove with-no-wornings
default-func -> default