Header file cleanup
C++11 friend