Code Review 4/9/2013 changes.