Add a bit more polish