Clean up boot_module() and boot_class() to be more self documenting