remove comments
refactor new call to get