Cleaned up code, added count string