Polished some stuff