shorten Shift.recent scope
code refactoring and bug fixes