DAR-2133 fixing whitespaces