Refactioring Project for SE-262