Code cleanup
Minor cleanup