(Refactor) Minor changes