Initial commit
Minor cleanup