refactor: more work on newsletter form