Improve looks a little