Added C++11 syntax support
Commented out unused code