Refactoring: cleared minor warnings