More design improvements 2
removed commented out code plus some more design improvements