Various style improvements and fixes