Count
Cleaned up a little