minor updates to cleanup code and comments

7 jobs for add_packer_and_terraform_template in 3 minutes (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #801585839
lint

00:01:54

passed #801585838
test

00:01:54

 
  Build Binary
passed #801585841
build-binary-alpine

00:01:05

manual #801585845
allowed to fail manual
build-binary-client-linux
 
  Build Image
manual #801585851
allowed to fail manual
build-image-feature-client
manual #801585853
allowed to fail manual
build-image-feature-client-extended
manual #801585849
allowed to fail manual
build-image-feature-server