PrimarySpell v0.2.1

Code clean up