Change delimiter made better