Code cleanup. Leverage @OnLoad.