Format changes

Clean up edit|remove| and counts