Formatting and squash bugs