- refactored Statement parsing