Add screenshot
Code cleaning