Polished up some stuff