[CORE] compacted code and unified common strings