Few small clean ups.