Return string and cleaner solution