Refactoring demo2 project a e b