Cleanup with c++14 features