Added a check for the /Screenshots folder
Removed commented-out code. Improved the general check.