refactored mirror maintenance code into expansion block; simplifies and shortens further... -sai