Tidying up auth process