- applying the code inspection fixes and cleanup