Minor changes
Minor refactoring, moving generators to JSValue. Closes #41