(fix): apply changes as per review