- applying code inspection fixes