Cleaned up scripts

Scripts cleaned up for "barebones" versions with fewer comments, as well
as other minor edits.