Minor optimizations by separating features in two distinct groups