Simplify and clean up

Also need to use the leading zero count so that the initial zeros
are skipped