formatting
move make_unique out of std namespace and allow building with c++14 compilers
( -std=c++1y )