tidy up some
abstract the account setup