Worked on #77. Added the *identifiers to the scanner.
Formatting