More refactoring
Add Spectacle