further code clean-up since properties deep-copy is properly working now :P