warnings and refactorings