Got rid of more hard coded indexes