More code clean-up (making the mod small \o/)