Indentation cleanup and added some missing `var` and `;` bits.