Various fixes of code style