Clean up of formatting