CAS-1267: Fixed formatting issues with whitespaces