Formatting
Tweak JS