Reorg code for commit