Code design improvement