Refactored ScreenshotTaker and Solo