Cleanup + added lzw handling class