Refactor code to use standard return functioning with respect to setting
a ret value and going to cleanup.