Clean up to_i calls