Working on registration, refactoring client information