utility dir
big code cleanup
cosmetic changes