Polished SwapUtil and added commit.