Make compile under C++03

Also fix some indentation