minor cleanup
minor auth refactor