fix formatting and names