Code cleanup
Minor cleanup
Minor clenaup