Compression improvement
Added todo
Cleaned up