Fix style stuff from jsirois review