Code style review first pass