some cosmetic post fixes for the no more E265 commit