Moved friend declaration lower to be next to the method it's required for
Added a blank line to the output
Removed two obsolete files