Update for formatting and jQuery deprecations