CrazyLogin: some code cleanup