minor tweaks, such as formatting and whitespace