Some refactoring
Add WARNING face