[Core/Auth] Some cleanup with some coding.