NOJIRA: modest refactoring to improve UX, exp. initial signin