refactor slightly
names