Easy/BeautifulStrings minor cleanup