Some more small tweaks and formatting