Adding return object and code cleanup of veracode

Will use Jed's suggestion from #58