Further refactor of spectra/timespectra