Adding return object and code cleanup of veracode