Minor optimizations, moved campos a bit higher