Removed more comments and updated script