Various style improvements