Minor code tweaks
Minor code tweaks