Fix style and name optimize field