Exception refactoring, uses now stdexcept
Commenting