Polished some details