refactor sunspots