cleanup on style