Code style & inspection fixes