Remove some redundant code and improve archive list