strong project logic refactoring part 01