Update style and simpler substring