Added screenshot, some cleanup and refactoring