Cleans up auth logic