Code improvements
Implemented reading attributes for files in snapshots
Tidy