Cleanup to use 2D array for post