Formatting clean up