Code cleanup - tools module.
Code cleanup - tasks module.
Code cleanup - core module.