Refactor to simply compaction code slightly