Touch up and fix useless code update. Lots to go