Fixing formatting; Removing unnecessary argument.
Simplifying count query.