Code cleanup and removed an nslog statement