Added move assignemnt operator
Some cleanup