Improved spacing
Fixed missing comment count. Closes #17