Minor cleanup and update README