sort refactor
remove getById