Change dialect to C++11. Reduce circle segments. Use range-based-for-loop and remove_if.