Cleaning up extra whitespaces