Inverted Index Implementation Cleanup