refactorin gproject 45%