Code Editor : cleanup