Commit bc81220dfcf3419085c545b4a271aa04178c6960

Russell Belfer 2014-05-31T10:19:55

minor cleanups