feature: some optimizations.