just a refactoring commit, I got some really wierd problem with
compiler-optimizer. A shuffler that calls another swap function is
always faster for unknonw reason.

Signed-off-by: peng <pc175@uow.edu.au>