Basic structure error added
Number/Int Expectation code cleanup