Some little code impr.