Fix alignBins for full width not 500 MHz, code tidying.