Moved comment into default clause and fixed case order