Formatting and cleaning up