Did some cleanup work
Prepared the IScanner interface for the upcoming change in the Lexer