refectoring project
adding encapsulated