Code style polish