Adds some formatting and clean up