Refactoring property

instead using getters and setters, i'll use will Set now.