Small formatting fixes+