Fix counting issue, minor formatting
2 files changed