Easier retention setting, some logic cleanup, etc.