Changing id's to strings and removing unnecessary method