PrimarySpell v0.2.2

another code cleanup