Minor cleanup for marmalade