start of simplifying code
code cleanup