Cleaned up initial account setup