Add comments and clean-up wscript