Added changes suggested in the rspect code review