Code & comment cleanup
Testscript
Added testscript