The rest of the logic here doesn't use return, can it be removed? Also please remove the commented out line if it isn't needed.