Refactored ScreenshotTaker
Minor javadoc updates