bug-1208: whitespace

bug-1208: whitespaces
bug-1208: Formatting uppercase to lowercase
bug-1208: spacing