=== 7.x-0.5 ===
Mod: Better style structure.