Cleanup, compacting and optimization part.2 pack