Some fixing of code style