counting method updates + cleanup