Cleaned up scripts