A few tweaks an changes for readability.