Clean up bin width code