Optimizations

Trying to avoid scope creep this time :P