Re-format to remove extra whitespace