Cleaned up Index