Refacored and Removed reference by variable