beautifier and concatenator changes