Fixed formatting bugs