Case statement improved.