Further fix formatting