- C++11 coding style
- removed apparently unused exception
- coding style