slight performance improvements