Got rid of redundant initializations