Code style improvements in several categories