Remove extra whitespace & fix formatting issues.