Better

Optimized things