Cleaning up code still in progress, getting there, will be much smaller, more efficient codebase