fixing bug that is a result of performing math on a string

fixing bug of performing math on a string id

removing unecessary returns