Included a failure case
Code Cleanup