Cleanups and simplifications to increase code clarity

frick, I see what is happening, will update

sorry :( Obviously my testing was not done correctly