Code review comments incorporated
Removed ultragrep file