Reduce complexity, improve compliance

From 270006MQFJ 270006MQFJ