code cleanups in unaligned