fix formatting and mistakes