Not sure if this will fix anything, but cleaned some things up.