Tidied up add and remove counts