Adds some formatting improvements