Some formattting fixes