Fix formatting of skeleton code
Add CountingFileInputStream