Changed id int name from 'par1' to 'id'
Cleaned some things up a bit