[CHARMAP]Code improvements (#436)