refactor for TFS project