some formating fixes