Switched to composition from inheritance, removed unnecessary fromStatement function