tweaks and formatting