Minor cleanup and change default frequencies