DAR-2557, fix whitespace issues