About your Clean Desk Policy/Clean Office Policy: don’t forget the whiteboards. Here’s the wording I use in my clients’ cybersecurity policies. You can have it free of charge to include in yours.
“Whiteboards containing Restricted or Sensitive Information should be erased or cleaned to the point where residual markings are unreadable from any angle in any light.”