Cleaned up some index layouts