Added better C++11 syntax
Added missing ? and / operator