Made some structure changes from merge errors