Minor cleanup of Scanner class