Various style improvement