Minor cleanup, verified login works