code cleanup II build-set
cosmetics