Some formating fixes