update to reflect coding standard; peephole optimizations