Refactoring in process...

Added identifier parsing functions.