Refactor methods post feedback