Refactor + Minor changes