Some cleanup, thx EclEmma