Cleanup and add formage