Code style and minor changes