Add check to prevent inserting initial data if it's already in the database. Do some lint cleaning.