C++11 style fixes
Move assignment to constructor