[US208.3] code simplification