Extended saving capability; code clean-up