Some refactoring and started on account activation process