Style changes mostly #215