i have completed some long overdue cleanup and re organization