(Feat/language map) Code clean up.