Some code clean up throughout all modules.