new warning links and small code refactoring