Formatting changes only, trim down JS a little