Minor structur tweaks.
Minor structure tweaks