code cleanup, addition of new helper files