Cleaned up the scripts