Removed path grouping code
Fixed simple warnings and hid name shadowing warning