Incremented version
Minor cleanup