Calculate the correct ID

Also, clean up computed properties