output parser cleanup
introducing classes for code interface