Removing unnecessary return
Added logging