Fixed issues and removed code inspection issues