anujgoyal [code] cleanup.
Latest commit c91ba01 Feb 28, 2016