Nail-care for previous commits and fix some nit-picks