Basic type checking of identifiers
Code cleanup for demo