Simplify archiving functions
Improve notation