Little styling improvements / slightly less inelegant.