Formatting tweaks and updated location.