Some style beautification