Looping through num columns instead of hardcoding 16 columns

- Shouldn't effect anything