smaller code optimizations