Small refactors to remove redundent copy constructors and assignment operators