Refactoring - incomplete werrors