Removed reference and usage of C++99 and more cleanup. Fix #50.