removing iterator and few more enhancements. #6