Added new move constructor.
Some small code cleanup.