Trivial/more style stuff

This one is intended to be accepted prior to ConnectionMess