Minor improvements of code style