Code cleanup
Minor tweaks