- applying the code inspection fixes