Polish a little bit