Fix formatting bugs