gnclmorais Code cleanup.
Latest commit 027617c May 21, 2015