Light refactor to include spectral_initializers
Refactor to clean things up.