utility dir
big code cleanup