A little bit of polishments