fix count, and some indentation.