small optimizations / layout