some formating fixed