Minor cleanup and JSHinting.