refactor cli and add ambience