Cleaned up counter