Clean up the login API

Very small baby steps