Removed C++11 dependencies (use of auto)