Prevent multiple return statements

Change based on review