957056 - update based on review. remove else