A bit more code optimizations