Refactored some Passed/Failure state code