Code cleanup; Store authenticated user in request;