Refactoring, warning hunt