Refactoring

Clear warning and errors