minor cleanup
c++11ify