Bring my last changes into synch with code conventions in this file