Cleanup comments in generator algorithm
Create Expression type hierarchy