Function comment changes & removal of if validation