fix semicolons, unused vars