Sign-up at index + Code refactoring