clean up comments, ou forms bootstrap style, optionsets++...