Refactor - remove warnings