Refactored Some Methods To Deploy Self