Initial source checkin
Minor cleanup