Improved &numberwidth calculation

Thanks to @erikrw for the improved version! :)