Code style improcements