fixed AbstractionWithPath, and cleaned up the code