Polished everything