Some more tweaks and changes, to make the whole thing shorter