Refactoring changes fixed