refactor for clarity
update gems