Small updates for clearity and update to make fuction return sooner