[core] Incorporate @tivac and @okuryu feedback