Some clean ups (rename preserved id to count)