Refactoring - will not build