Added TODO: right-align numbers