Continued clean-up & FFT for all sizes