cleanups and removed the sugar language