Add screenshot tags and code cleanup (more readable)

2 jobs for master in 43 seconds (queued for 3 seconds)