cleaning code and add screenshots