Code cleanup. Leverage @OnLoad.
Merge pull request #208 from karma-exchange-org/leverage_onload

Code cleanup. Leverage @OnLoad.