cee refactor;
rules sorting fix