Formatting: More Javascript clean-up