cleaned up the SI component of Statements and simplified Quest