Improve on the previous commit : this seems more eye pleasing, from my point of view.