Optimized forms code a bit